Merge "Limit the size of the screenshot message area" into tm-qpr-dev