LPS-44910 Fixing the saving of layoutIdMap
LPS-44910 Moving logic to the factory, no logic change
LPS-44910 SF