Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev
automerge: 74a4a8d

* commit '74a4a8d6162dde06297ff6c3ef264e7f9066b88f':
  Enhance computation of click point for accessibility.