Fix a race condition and lift requirement for patched udisks2