Hygiene: Make uploads page agnostic about current skin

and we should start reducing our usage on it where possible like so.

Change-Id: I71eba7c2f02783570f8e4f8705aac85fb294af38
Merge "Hygiene: Make uploads page agnostic about current skin"