Merge "Reduce setInputWindows calls" into rvc-dev