Fixing servicing bug by always specifying LayerFolderPath Upstream-commit: 33ae7d4c195d9096def013fcd4af32df3c2f4606 Component: engine