Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev