SWC-1486: try trick to fix some of Chrome's display issues (cherry pick commit from develop to release-47)