Merge "Update visual: AppSwitchPreference alignment"