Merge "GuidedStepFragment: fix missing Icon" into mnc-ub-dev