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

Change-Id: I9ff8d709ed0f12973783afa45a4ced3459c47676