Merge "Improve BLE scan attribution to facilitate debugging power issues"