Move disabling code to addOptionItem. Fix disabling logic in checkbox menu items and template. Fixes #17399.

(cherry picked from commit ead78ed67c4ee46c953adf95d72a63acbcc945b8)
Remove trailing comma. Refs #17399.

(cherry picked from commit 9c9a736b4ba28aa18a5842469766a61be23e9882)
Fixes #17239. Dock containerNode never created due to a typo.
(cherry picked from commit a231c07700de7f17db62139493313888850f2ab9)
update calendar submodule