Merge "Scale back up the task screenshot surface."