Merge "Make WebView track focal points more accurately" into jb-mr1-dev