Merge "Revert "Prevent committing session while in progress""