various changes
Fix Merge branch 'jb42-dev' of https://github.com/ProjectHydrogen/packages_apps_Settings into jb42-dev