Merge "Fix window manager policy state when waking from doze." into lmp-dev