Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev