Merge "GuidedStepFragment: API tuning" into mnc-ub-dev