Merge "Change AccessPointPreference to normal Preference"