Avoid using deprecated User::getSkin()

Also avoid calling deprecated User::getSkin().

Change-Id: I3870ffd3ad3007e6e01e8e5f768e83ddbb5358a5
Merge "Avoid using deprecated User::getSkin()"