Fix upload button behavior after upload

'Upload'/'Cancel' buttons were updating wrong things, and we weren't
sending a final resolution to the upload so didn't change it back
from 'cancel' properly.