merge file activity settings into a single 'favorite changed' item#22205

MorrisJobke merged 2 commits intomasternextcloud/server:masterfrom

activity-settings-cleanupnextcloud/server:activity-settings-cleanupCopy head branch name to clipboard