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

Change-Id: I221caa253b84661cff94ad5e037b91718a82119f