Merge "Fix WindowContext leak" into rvc-dev