Merge "WindowContext: Add @WindowType intdef" into rvc-dev