Merge "Rework thumbnails in activity manager."