Migrate layout_id into getLayoutArgs, rely on CodexLayout for more of save and restore