Merge remote-tracking branch 'sm/sm-jb-mr1' into HEAD
Merge branch 'sm-jb-mr1-qs' of https://github.com/SaberMod/android_packages_apps_Settings into HEAD