Merge "Wait longer for expected input events" into rvc-dev