Merge changes from topic "thumbnails-nyc-mr1-dev" into nyc-mr2-dev

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