Merge branch 'AddCheckboxToWorklowSkinStep' into next

* AddCheckboxToWorklowSkinStep:
  Add checkbox to control whether the skin label is used in workflow