Merge "Finish stash uploads with upload dialog"