Merge "Address race condition with drag from external window" into ub-launcher3-rvc-dev am: 1fe0a4e080

Change-Id: I16c1d400c42a7c99d7c7ee307ae3f90bfc43d181