Merge "Hold WakeLock while DreamService starts" into nyc-mr1-dev