Fixes
Merge branch 'jb-mr1' of git://github.com/crommix/packages_apps_Settings into jb-mr1