Merge "Fix sketchy usage of new PreferenceScreen" into oc-dev
am: 69faf046c0

Change-Id: I6c8310037826f13e9d468e9b27dc26d347b11249