Merge "Tweak preference adapter changes" into nyc-dev