Merge "Handle non BitmapDrawable thumbnails" into sc-v2-dev