Merge "Fix PhoneNumberPreferenceControllerTest" into main