Change main app to be the upload listener.
As part of the quickie hookup for metrics upload, the metrics was the
upload listener, and because of the transient state of the metrics, it
also had a timer to check if uploading.
Merge pull request #940 from garvankeeley/mainapp-upload-listener

Cleanup Metrics upload monitoring: Change main app to be the upload listener.