Merge "Add titles to PreferenceFragments and PreferenceScreens for watches." into nyc-mr1-dev