am 082a9fa3: Merge "Tap highlight fix + small perf increase"

* commit '082a9fa3438d343942851e538bb38b86ab1873b3':
  Tap highlight fix + small perf increase