Merge "Fix apn can't be updated when pressing back key"