Merge "Revert "ApnSettingsActivity shows the ActionBar"" into main