Merge "Adding support for 2 different entrance transitions for GuidedStepFragment." into mnc-ub-dev