Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev