Merge "Fix 5278371: OOM in MediaItemThumbnailTest"