Merge "Fix stop Ble scan logic" into main