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

Change-Id: Ibb466329ba10989a7e1bda77c484ed3b68bfe85e