try trick to fix some of Chrome's display issues
Merge pull request #1026 from jay-hodgson/release-47

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