Merge "Fixing styling issue with GuidedStepFragment." into nyc-dev