Merge "Add oldDream to mPreviousDreams always when dreams overlap" into udc-dev