[TIDOC-1916] Update toolbar property and fix validation error
[TIDOC-1916] Address PR comment
Merge pull request #6248 from bhatfield/tidoc-1916

[TIDOC-1916] Update toolbar property and fix validation error