Merge "Don't clear the selection when directory contents change."