FW: Some House Keeping

Change-Id: I5c7d390f2ddd39246f61db0e14c4b5f9c0f37fd5

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/provider/Settings.java
	core/res/res/drawable-xhdpi/default_wallpaper.jpg
	packages/SystemUI/res/values/colors.xml
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java