Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev