Merge "OverlayDeviceTests: don't rely on Thread#sleep" into qt-dev