Merge "Show "add access point" when the user selects add Apn." into main