Merge "Remove PreferenceActivity" into nyc-dev