Merge "Revert "Crop surface to the content size during drag-resizing"" into udc-qpr-dev