Merge "Catch crashes in onScanVolume" into udc-mainline-prod