Merge "Fix bug where screenshot preview margins were too large" into tm-qpr-dev