Merge "PhoneWindowPolicy: Fix NPE race condition by excessive screen on delay" into cm-10.2

(cherry picked from commit 26f3ce38468e949fa962226091be3bf5c331b6c2)

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