Merge "Change phone number preference to unselectable" into main