Merge changes from topic "thumbnails-nyc-mr1-dev" into cw-f-dev

* changes:
  [automerger] Rework thumbnail cleanup am: 82a2a87474
  Rework thumbnail cleanup