Merge "Fix the system gender in ActivityRecord objects" into main