Merge "Bluetooth: Cleanup bt_config.xml during BLE Scan"