Merge "Adjust where the back button is rendered for new SUW requirements." into main