Merge "Redact GridTaskViewThumbnail"