Simplify dependency overrides
TAP5-2310: Support form actions only triggered if the form is cancelled