Merge "GuidedStepFragment: two columns actions" into mnc-ub-dev