Merge pull request #33921 from mike-spa/portToMaster

Port PRs to master

Author: RomanPudashkin

src/engraving/compat/engravingcompat.cpp

@@ -237,7 +237,8 @@ void EngravingCompat::adjustVBoxDistances(MasterScore* masterScore)
                     VBox* first = static_cast<VBox*>(mb);
                     VBox* second = static_cast<VBox*>(nextmb);
                     if (first->bottomGap() > 0_sp && second->topGap() > 0_sp) {
-                        first->setBottomGap(first->bottomGap() + second->topGap()); // Because pre-4.6 these used to be added
+                        first->setProperty(Pid::BOTTOM_GAP, first->bottomGap() + second->topGap()); // Because pre-4.6 these used to be added
+                        first->setPropertyFlags(Pid::BOTTOM_GAP, PropertyFlags::UNSTYLED);
                     }
                 }
             }

src/propertiespanel/qml/MuseScore/PropertiesPanel/text/textsettingsmodel.cpp

@@ -708,7 +708,7 @@ void TextSettingsModel::updateIsPositionAvailable()
 {
     bool available = false;
     for (EngravingItem* item : m_elementList) {
-        if (item->isTextLineBase()) {
+        if (item->isTextLineBase() || item->isMeasureNumber()) {
             available = false;
             break;
         } else if (!item->hasVoiceAssignmentProperties()) {