Merge commit 'c1ff066961f437784ae2474e93e5ea041f77cfc1' into HEAD

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/app/WallpaperManager.java
	core/java/android/widget/ProgressBar.java
	core/res/res/values/config.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/BarTransitions.java
	packages/WallpaperCropper/src/com/android/wallpapercropper/WallpaperCropActivity.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/pm/Installer.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/power/ShutdownThread.java
Fix mismerge

Conflicts:
	core/java/android/app/WallpaperManager.java
	core/res/res/values/config.xml
Fixes for derp from 4.4.3 transitions