Merge "Revert "Fix race condition triggered by quick stop/start of Dream"" into cw-f-dev