Merge "ASoC: WCD9310: Defer the setup of headphone removal detection" into msm-3.4