Merge "Don't reset search in two pane sheet" into main