Improve flag help consistency, and update docs Upstream-commit: de64324109d2694b1525e62b5c0072267282a36c Component: engine