Merge "Announce new state of modes when toggled in Modes Dialog" into main