Merge "Track BLE Scanning statistics by UID instead of by package name" into oc-dev