Merge "ASoC: wcd9xxx: Avoid plug type re-determination"