Merge "Merge "Add note for FLAG_CANCEL_CURRENT when stopping scan" into pi-dev am: 3667b712 am: 3f758d8e"