Merge "WM: Fix flaky DragDropControllerTests tests"