Make Dark UI and Theme Chooser play nicely

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