fixed a bug preventing the switcher to upload self avatar
Merge branch 'upstream/master'
Merge branch 'master'