Merge "Doze: Fix NPE found when pulsing and !dozing." into lmp-dev