Merge "Fix location for BLE and classic scan results"