Fix AuthenticatorActivity not launching.
Merge abstract uploader classes.
Fix typos in comments, remove unused import.
Merge branch 'master' into wip-sss-upload