LPS-33191 Don't add activity for each file entry in a trashed folder, but add one for the folder
LPS-33191 Source formatting