Merge "Fix issue #7214462: Some recent thumbnails are black." into jb-mr1-dev