Merge "Add support for editable actions to GuidedSteps" into mnc-ub-dev