Merge branch 'shared/xorg-7.4-update' into org.openembedded.dev