Hygiene: Cleanup handling of stylesheets in skins

Change-Id: I6896bd86ab3ef13f96a2b89a44d53550a87d0046
Merge "Hygiene: Cleanup handling of stylesheets in skins"