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

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