Merge "apq8064: MBHC single button detection not working" into msm-3.0