Merge "GuidedStepFragment transition and new features" into mnc-ub-dev