Merge "Fix WindowContext leak" into rvc-dev am: 5c082c998f am: c4750c036b am: 012c588127

Change-Id: I3ca2640f3593684dfbe0cd288f2847a83dfc6206