Revert "[2/2] frameworks/base: Add Captive Detection toggle"

This reverts commit 17a43459ed7204fbfab78e19a47245758a6a56e6.
Frameworks: status bar notification count (1/2)

credit: burnsra & rmcc (cm)
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging
AOSPAL-Platlogo[2/2]
Add Lightbulb NavRing target (1/2)
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
Revert "Custom Wallpaper: use PNG and fix derp"

This reverts commit bf98d1bea8d8c7c83531a4f0b08c21a696ce78d7.
Revert "Custom lockscreen wallpaper [1/2]"

This reverts commit 564b642857ac467d98cc2cc2ec480182e324b5c0.

Conflicts:
	services/java/com/android/server/power/DisplayPowerController.java
Merge remote-tracking branch 'PA/kitkat' into kitkat-staging

Biggest merge i've ever been

-I have to remove LS Blur, alongside with LS See through

Conflicts:
	cmds/bootanimation/BootAnimation.cpp
	core/java/android/provider/Settings.java
	core/res/AndroidManifest.xml
	media/java/android/media/AudioService.java
	packages/Keyguard/src/com/android/keyguard/KeyguardMultiUserAvatar.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	packages/SettingsProvider/res/values/defaults.xml
	packages/SystemUI/res/values-ca/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/WallpaperManagerService.java
	services/java/com/android/server/power/DisplayPowerController.java
	services/java/com/android/server/wm/WindowAnimator.java
	services/java/com/android/server/wm/WindowManagerService.java
Fix build errors
Merge remote-tracking branch 'base/kitkat-staging' into kitkat-legacy-staging

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/psd_config.xml
	packages/SettingsProvider/res/values/defaults.xml
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/power/DisplayPowerController.java