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