Merge "Merge "Catch crashes in onScanVolume" into udc-mainline-prod am: 375964fe66" into main