Merge "Fix session start race condition" into main