Merge "Improved support for workspace screen thumbnails"