Merge "ASoC: msm8226: Disable headset detection"