Merge "Revert "Fix bug where very large widgets get cropped out"" into tm-qpr-dev