bigger update

Change-Id: I9dc281df56c49d5caffd5cfbe6aebd46579b51ef

Conflicts:
	core/java/android/app/Activity.java
	packages/SystemUI/res/layout/halo_content.xml
	packages/SystemUI/res/layout/halo_layout.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java
	services/java/com/android/server/am/ActivityStack.java