Merge "Scroll to bottom of screen when adding preferences via code" into oc-dev