Merge branch 'jb-mr1' of github.com:Root-Box/packages_apps_Settings into jb-mr1