Merge "Show GSM settings with CDMA phone type" into main