Merge "[pm] reduce lock contention on createSession" into main