Merge "WindowContext: Add @WindowType intdef" into rvc-dev am: 76b221c84b am: 22c79f5dfe

Change-Id: I0f6b6a0720e7ee6044e04a07848579fc94e732cf