Merge "Fix broken MediaSwitchingControllerTest" into main