Merge "Enhance computation of click point for accessibility." into lmp-mr1-dev