Merge "Resize preview for correct clipping" into tm-qpr-dev