Merge "Pass phpcs-strict on skins/"