FBM orders now get properly marked as shipped (automatically!), so you can use the ‘On Shipped’ trigger with greater reliability.
Also, they will get marked as delivered if the delivery window (set by you and amazon in Seller Central) reaches the end.