Merge "Refactor Bluetooth scan mode APIs"