Merge "Fix MainSwitchPreference crash on Android L" into main