misses fixes and headaches
Merge remote-tracking branch 'origin/testing' into testing

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java