Merge "Don't handle click if the resolver is already finishing." into klp-dev