Merge branch 'main' into worktree-agent-a15cecfec57d5290d

# Conflicts:
#	crates/effects/src/ocio.rs
#	crates/engine/src/commands/stubs.rs
#	docs/parity.md

crates/engine/src/menus.rs

@@ -688,6 +688,8 @@ Layer
     Matte with Layer Above | layer.trackMatte {"op":"above"}
     Matte with Layer Below | layer.trackMatte {"op":"below"}
   Layer Styles
+    Layer Style Options... | layer.style.options
+    ---
     Convert to Editable Styles | layer.style.convertToEditable
     Show All | layer.style.showAll
     Remove All | layer.style.removeAll