Merge "Browser: Fix bug still display sub folder in add-to list if folder removed"