Merge "GuidedStepFragment: allow editing a different text than title" into mnc-ub-dev