Merge "Clean up unused MobilePlanPreferenceController" into main