Merge "Rework thumbnail cleanup" into oc-dr1-dev am: 30755424d1  -s ours
am: ca4a879f9d  -s ours

Change-Id: I33c98cf6058de6d52928a73a3fce7d5d7fcab5bd