Merge "GuidedStepFragment: refactoring the focusable control" into mnc-ub-dev