Merge remote-tracking branch 'aosp/kitkat-mr1-release' into HEAD

Conflicts:
	packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardTransportControlView.java
	packages/Keyguard/src/com/android/keyguard/KeyguardViewStateManager.java
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsTileView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/PhoneWindow.java
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceWrapper.java
	services/java/com/android/server/am/ActivityStack.java
	services/java/com/android/server/power/DisplayPowerController.java
	tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderAction.java
	tools/layoutlib/create/src/com/android/tools/layoutlib/create/Main.java

Change-Id: Iaa150fb08789d703d138b745f2f54bb02842bbd2

Conflicts:
	services/java/com/android/server/display/WifiDisplayController.java
    fb: qs tweeks

    - fix fc problem on tablets
    - fix filtering of unsupported tiles
    - add music tile options (disable artwork, disable track title optional)
    - add instance handling as well to the tile chooser dialog
    - add cancel button to chooser dialog
    - battery tile short press now battery stats - longpress batteryicon settings
    - rotation tile lonpress - rotation settings
    - collapse drawer on go to sleep tile

Change-Id: I98e5c0c3fd7914de6a6b470f0d816af6028a3c5c