Merge "Support for enabling skins in the installer"