Merge "Fix thumbnail hvcc key in ItemTable"