Merge "Add flag for UI changes in MU settings" into main