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