Merge "API: Clean up skin handling"