Some dirty fixes
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_XYSettings into jellybean