Fix layer store Get locking Upstream-commit: 156c5db889b29e28e0176019b1996af4a5465a77 Component: engine