[stable-33.1.0] fix(upload-list): handle conflict actions#16858

alperozturk96 merged 10 commits into

stable-33.1.0nextcloud/android:stable-33.1.0from

backport/16819/stable-33.1.0nextcloud/android:backport/16819/stable-33.1.0Copy head branch name to clipboard