Merge "GuidedStepFragments: closer to ux guidlines" into nyc-support-24.1-dev