Merge "Fix NPE in testWindowContextAddMismatchedWindowType" into sc-v2-dev