Merge "Bluetooth: prevent dup DISCOVERY_STOP's pending" into msm-3.0