Merge "Refactor AccessPointPreference"