* changes: [automerger] Rework thumbnail cleanup am: 82a2a874 am: 97eb9d05 [automerger] Rework thumbnail cleanup am: 82a2a874 Rework thumbnail cleanup