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

Change-Id: Ia718bfce9fa92f428b4e8fd1d3f0af4e80e4643f