Merge proposals dependent on lp://staging/~thomas-voss/biometryd/immediately-cancel-operations

1. immediately-cancel-operations
2. Dependent merge proposals