Merge "Hide emergency APN in user settings"