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

Change-Id: I8eebc991b52af8601694e621859b4b0a4884d97f