Merge "Work challenge background: Fix top padding" into nyc-dev