Merge 1

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/NavigationBarView.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	services/java/com/android/server/am/ActivityStack.java

Change-Id: Id283270d7a50f2d7143db644796aed0f69ba59da

Conflicts:

	core/java/android/content/res/Resources.java
	core/java/android/provider/Settings.java
	core/java/android/util/DisplayMetrics.java
	core/java/android/view/DisplayInfo.java
	core/res/res/values/dimens.xml
	graphics/java/android/graphics/Bitmap.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java