Merge "SideBySide2: Avoid duplicate draft creation by fixing race condition"