Per-App-Color & Expand revamp

Conflicts:
	core/java/android/app/ActivityThread.java