LPS-51281 Handle layoutIds vs layoutIdMap properly when indexing the staging configuration