Merge branch 'orca4' of https://github.com/shamukillaz/android_packages_apps_Settings into orca4

Conflicts:
	res/xml/settings_headers.xml
Settings Header