Merge "Merge "Scroll to bottom of screen when adding preferences via code" into oc-dev am: 852cdeabfd am: 3d258134bb am: 84789cfeff" into oc-mr1-dev-plus-aosp