Merge "Clean up certain state transitions in DreamService." into klp-modular-dev