Merge "Properly fail commit of a new staged session if another one is in progress"