* changes: Add oldDream to mPreviousDreams always when dreams overlap DO NOT MERGE Revert "DO NOT MERGE Revert "Handle dream restart""