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

Change-Id: I26225bb9c186bf9a5a9e42bdd8130bfe1a29066b