Merge "Rework selection handling for items in the DirectoryFragment."