Merge "Fix WindowContext leak" into rvc-dev am: 5c082c99 am: c4750c03 am: 012c5881 am: b59ad8e1 Change-Id: Ieb0f4ca9670805268820e41dd80b8a10207b6645