Merge "Don't cancel injected event when mouse event arrives" into qt-dev