Merge "Make drag handle tests stable."