Merge "Revert "Thumbnails: allow overflow inside thumbnails""