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

Change-Id: I1c352c8933cac56bc88a2965d49ce3cdad4b6bfd