Ensure uploads from user namespace go to correct page

Currently they are always going to main namespace

Change-Id: I6c9b9d94b53bc2d28db2faedc6e7773841be35fd
Merge "Ensure uploads from user namespace go to correct page"