Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy

Conflicts:
	res/values/arrays.xml

Change-Id: Ifdf0009cf26d6c25737fd36f245c3dc73729297d