Add more locking to storage drivers Upstream-commit: 1ad165dba151a76af30a8dee548d9e5689183227 Component: engine