Merge "Draw an empty border around glyphs to avoid sampling issues Bug #6942209" into jb-mr1-dev