Merge "Ignore repeated dismissals for clipboard" into tm-dev