Fix race condition in upload with push (#10214)

If the upload finishes before the poll timer is fired on the client side then the client will poll forever with the wrong id

Change-Id: I11cad8e978a8499a4fddb9e8bfe7f6c4326f98f5