Merge "Cleanup pass over layout files in design samples" into nyc-support-24.1-dev