Merge "GuidedStepFragment: Fix ResourceNotFound crash before v21" into nyc-support-24.1-dev