make room for Hybrid
Merge https://github.com/droyd/packages_apps_Settings into jb4.3