Merge "Ignore onPreferenceChange for top level preference" into nyc-mr1-dev