merge: replace mod/master with mod/master-resync (upstream sync checkpoint)
Full upstream resync: mod/master-resync was rebuilt from upstream/master with all mod features re-applied to the new ActivityManager architecture. This merge records the history connection but keeps the resync content.
This commit is contained in: