Merge "Update BrandedAccountPreferenceController"