Merge "Avoid spurious tap events." into jb-ub-mail