Merge "Scale screenWidth for split proportionally for thumbnail matrix" into tm-qpr-dev