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

Change-Id: I56818117c8c16e2fffb100cb7a64488c99e30fbe