ASoC: Merge dropped fixes from v5.18