* changes: Rewrite handling of failed sessions (2/n) Rewrite the broadcast receiver for ACTION_CANCEL_ENABLE_ROLLBACK (1/n) Remove #mNewRollbacks (10/n) Put rollbacks into #mRollbacks (9/n) Add a flag to facilitate merging 2 rollback collections (8/n)