Change the namespaces where we show upload to main and user

Previously main and talk (probably not what we wanted).

Change-Id: I515359d4c27184192f23e309ace066390a0b931b
Merge "Change the namespaces where we show upload to main and user"