am b129e946: am a6f387a0: Merge "Don\'t handle click if the resolver is...
am b129e946: am a6f387a0: Merge "Don\'t handle click if the resolver is already finishing." into klp-dev
* commit 'b129e946':
Don't handle click if the resolver is already finishing.