Merge "Avoid holding lock while creating and starting storage session" into main