am c2cebee6: am 8db6d9af: Merge "Clean up certain state transitions in DreamService." into klp-modular-dev

* commit 'c2cebee67a2dafe850e39b2ae3bc8b2f44426901':
  Clean up certain state transitions in DreamService.