Merge "Ensure QuickSettingsControllerImpl is off when scenes are on" into main