Merge "Improve find on page accessibility" into jb-mr1-dev