* Api: Move display options to client Upstream-commit: 37b80325d0b20a0a5c85dd0eb3b49126a799204a Component: engine