Merge "Ensuring that null thumbnails have an opaque background."