Merge "Make sure thumbnailViewDeprecated is only accessed when refactor flag is off" into main