Merge "Handles DeadObjectExceptions in WalletContextualLocationsService." into main