[TIDOC-1382][TIDOC-1383][TIDOC-1384] Add disabledColor property and some other fixes
[TIDOC-1382] Update per PR comment
Merge pull request #5029 from bhatfield/tidoc-1382

[TIDOC-1382][TIDOC-1383][TIDOC-1384] Add disabledColor property and some other fixes