Hygiene: Organise our long list of globals

Help make them more discoverable.
* Kill the now reundant upload progress bar global.

Change-Id: Ie57c1737b2afe742d5b63d36e9e70eabb84ce699
Merge "Hygiene: Organise our long list of globals"