Cherry-pick fix for bot title