Improve timestamp formatting Upstream-commit: 59a07f6478da19fe44294f651ed0de214b53674e Component: engine