[CP Staging] Revert "Add toggle for enable/disable instead of label" + Remove usages of EMPTY_STRING

[CP Staging] Revert "Add toggle for enable/disable instead of label" + Remove usages of EMPTY_STRING #150269