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