Backport langcode fixes to 11.x

Closes #3337864

Merge request reports

Loading