Always use the latest timestamp for merged activities#17484

rullzer merged 1 commit intomasternextcloud/server:masterfrom

bugfix/activity-last-timestamp-mergednextcloud/server:bugfix/activity-last-timestamp-mergedCopy head branch name to clipboard