Merge "Misc polishing fixes for Settings" into oc-mr1-dev