Merge "Fix missing timeline due to unexpected navigation type."