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

Conflicts:
	src/com/android/settings/paranoid/Toolbar.java

Change-Id: I1983a537f84ce8f414d371135518d51c6ba33dad