Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am: 90a6054805 am: 94b497bccc am: f61df4329b am: 49768c1391"