Merge "Add ConnectedAccessPointPreference"