Keep CKUploader alive until invalidated
Merge branch 'v2.x-beta' into nil-url-display-name