Merge "Fixing small regression where dropping from a folder causes the search bar to flash."