Merge "392648: NPE when traversing navigator tree"