Merge "Don't throw when canceling removing packages" into main