Merge "Ensure that we destroy view before adding another" into main