Merge "[SettingsLib] Add missing AccessPoint listener"