Merge main, resolve conflicts, and fix content path references#190

Copilot wants to merge 5 commits intosimplify-client-appgithub-samples/pets-workshop:simplify-client-appfrom

copilot/sub-pr-179github-samples/pets-workshop:copilot/sub-pr-179Copy head branch name to clipboard