Merge "Not to add invalid spell check spans Bug: 6464197" into jb-dev