Merge "Enable host interleaving BR/EDR device discovery and ble scan for flo" into klp-dev