Issue #3427398 by aaron.ferris, alexpott, sdhruvi5142, rkoller, smustgrave,...

Issue #3427398 by aaron.ferris, alexpott, sdhruvi5142, rkoller, smustgrave, DanielVeza: Cancel button on the discard changes in the layout builder confirmation step should take you back to the layout builder

(cherry picked from commit 8c50a65a)