Merge "Abandon other staged sessions when a rollback is staged." into sc-dev