Merge "Fixed AccessPreference listener." into nyc-dev