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

Change-Id: Iba20dd9ca6cd28e3a4688ca2f18b01590a248500