Merge "GuidedStepFragment: lots of editing improvements" into mnc-ub-dev