Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev