Merge in latest skin changes: Commit: 09429f04b67f92717d38e11dacbea9ab850c4679 (HEAD, origin/rsmart-52x, rsmart-52x)
Fixes https://github.com/rSmart/issues/issues/327