Merge "Remove a bad heuristic when determining click location for accessibility." into lmp-mr1-dev