Clean up 
Merge branch 'patch-3' of https://github.com/franco-c/packages_apps_XYSettings into jellybean