Merge "API: Don't rollback changes if the exception was a UsageException"