Merge "Fix ActivityCallerState's user id resolution" into main