Merge "Remove mobile type for email field" into android_ui.lnx.2.1-dev