Fix duplicate layers in manifest Upstream-commit: cd72c7f3bb43a39d68baec776f200d20a645a48c Component: engine