Merge "Fix WindowContextTests" into rvc-dev