Merge "Only refresh DISABLED_NO_THUMBNAIL when thumbnail changes" into sc-v2-dev