Squash commit Lockscreen blur, transparent and rotation from PA (1/2)
Battery bar (1/2)

Conflicts:
	core/java/android/provider/Settings.java