Merge "Fixing weird deferred click events after deleting folder"