Merge "Fixing issue with phone number pickers: it was returning the wrong data type"