Merged in latest changes to the nav stack (needed for clearing sonar layer)