Merge "InputMonitor: Ensure we assign input to correct Surface" into rvc-dev