Merge "Fix memory leak caused by mismatched linkToDeath() in WindowManagerService"