Merge "Notifies correct device state callback on cancellation" into sc-v2-dev