Merge "RollbackManager: Keep track of "in progress" rollbacks."