Merge "Fixing issue where flinging-to-delete from a folder does not reflow/close the folder. (Bug 6240540)"