Merge "Revert^2 "Filter memory tombstone fields before DropBox logging"" into main