Merge Container and State mutexes Upstream-commit: 280b64bc7baf3cff48eb2f07330d693eebfaaee7 Component: engine