Merge "Don't observe Modes changes if MODES_UI is disabled" into main