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

Change-Id: I27b2513e5ee63e77ae82dc9be07706246b463553