Hygiene: Split out thumbnail content less

Change-Id: I641523251bf02f738dc0cc8bd0936dbfe0ead552
Merge "Hygiene: Split out thumbnail content less"