Merge "Clean up preference_summary_default_combination in SystemUI." into main