Merge "Rework thumbnail cleanup" into nyc-mr1-dev