Merge "Add flags for changes that are part of alarm improvements in MU" into main