Merge "Bluetooth: Ensure socket pointer is set during callback" into msm-3.0