Merge changes from topic "am-b983e737-8063-4bbb-b24b-3dea9090b65e"

* changes:
  [automerger skipped] DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream skipped: a43886bcaa
  DO NOT MERGE Fix error caused by quick stopDream(false) + startDream() with same dream