Merge "Fix NPE in AudioSwitchPreferenceController" into 24D1-dev