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

Change-Id: I09c76ff6fec4f0e0795b7502a547c3faeb3fb010