Merge "WindowContext: Add @WindowType intdef" into rvc-dev am: 76b221c8 am: 15d1fb6a am: 695ea02c am: f2bc2ac6 Change-Id: I9ff8d709ed0f12973783afa45a4ced3459c47676