Merge "Miscellaneous fixes for Settings" into jb-mr1-dev