add metrics for clicking upload

metrics that are required for dual device uploader. @kentquirk @jebeck  
the generic handler that was being used specified stopPropagation which is why I moved it across. Will update