Merge "Re-enable FREEFORM task shortcut when DW is unsupported" into main