Update: restore ItemStoreTakeover serialized layout - should allow to merge-and-upgrade all prefab changes, I hope. Will remove it post-merge. Tests: editor compiles