Merge "Keep instance of BinderInputWindow for the same token."