Merge "Fix WindowInputTests#testOverlapWindow failing (1/2)" into rvc-dev