Merge branch 'cm' into HEAD hopefully the last of it's type

Previous HEAD was ea515cd

Conflicts:
	packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
	packages/Keyguard/res/layout-port/keyguard_host_view.xml
	packages/Keyguard/res/values/dimens.xml
	packages/SystemUI/AndroidManifest.xml
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/wm/WindowManagerService.java

Change-Id: I8ee18b572bff1b5b5dbd7158177d17cb2b95cab5
Signed-off-by: DHOMD <DHO@dho.im>