Merge change I1d1ed967

* changes:
  Tap delays; making tap UI feel better. Addresses bug 2317577