             
             // Restore targetNavigator properties.
             targetNavigator.includeInLayout = navigatorProps.targetNavigatorIncludeInLayout;
+
+            // Restore the target navigator to normal layout mode if 
+            // that's the mode it was in before the transition.
+            if (!navigatorProps.usesAdvancedLayout)
+                targetNavigator.clearAdvancedLayoutFeatures();
         }
 
         transitionGroup = null;

                
        // Disable layout for our targetNavigator temporarily.
        navigatorProps.targetNavigatorIncludeInLayout = targetNavigator.includeInLayout;
        targetNavigator.includeInLayout = false;
    }


            if (endView)
            {
                endView.includeInLayout = endViewProps.includeInLayout;
                
                // Restore the end view to normal layout mode if if 
                // that's the mode it was in before the transition.
                if (!endViewProps.usesAdvancedLayout)
                    endView.clearAdvancedLayoutFeatures();
                endViewProps = null;
            }
        }
