Merge "Interleave br/edr device discovery with BLE device scan for some targets" into klp-dev