Merge pull request #2942 from jpgough-ms/default-layout-persistence