Closes #6011 Text overlap
Closes #6011 Text overlap

alexgibson/bedrock,flodolo/bedrock,mozilla/bedrock,kyoshino/bedrock,kyoshino/bedrock,hoosteeno/bedrock,MichaelKohler/bedrock,MichaelKohler/bedrock,craigcook/bedrock,kyoshino/bedrock,mozilla/bedrock,hoosteeno/bedrock,pascalchevrel/bedrock,sgarrity/bedrock,pascalchevrel/bedrock,ericawright/bedrock,pascalchevrel/bedrock,pascalchevrel/bedrock,sylvestre/bedrock,alexgibson/bedrock,flodolo/bedrock,ericawright/bedrock,hoosteeno/bedrock,hoosteeno/bedrock,sylvestre/bedrock,alexgibson/bedrock,kyoshino/bedrock,craigcook/bedrock,flodolo/bedrock,MichaelKohler/bedrock,craigcook/bedrock,craigcook/bedrock,ericawright/bedrock,sgarrity/bedrock,alexgibson/bedrock,sylvestre/bedrock,mozilla/bedrock,flodolo/bedrock,sgarrity/bedrock,ericawright/bedrock,sylvestre/bedrock,mozilla/bedrock,sgarrity/bedrock,MichaelKohler/bedrock