Merge "Modernize BLE Scanner implementation (1/3)"