Merge "Cleanup stacks before performing drag and drop tests" into nyc-dev