PN-7736 Synchronize skin detection between JSP and JS

Merging into 2.4.0