LPS-47403 Further removal of LayoutSetPrototypes leftovers exposed by earlier fixes