Merge "Simplify the duplicate click checker logic" into tm-dev