#388 - Backport the CompleteOrderActivity rollback handler to 3.0.6