Merge "Stop global locking on session calls and UID state cache" into main