Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev