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