Merge "Remove flag activity_snapshot_by_default" into main