Fix race conditions in logs API Upstream-commit: 07dc3aa685ffd500ada1c41f8a9b7eaf74cf09eb Component: engine