Merge branch 'feature/add_cancel_button_to_upload_notification' of github.com:nextcloud/android into feature/add_cancel_button_to_upload_notification