[MERGE] Adding some upstream missing skin related files