Merge "Revert "Migrate MainSwitchBar in Settings to Material3"" into main