Merge "Schedule rollback expiration when a rollback is enabled."