Merge "Fixing image sizes inside step cues, and other small bugs"