Merge "msm8974: Prevent USB h/w reset on every cable disconnect" into msm-3.4