Fixing broken Layout and LayoutSet Prototype propagation test and unrelted SF