Merge "Fix Issue #35489: drm content corruption on GB"