Hybrid w/o reboot - cleanup

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java