Merge changes Iea6e6976,Ic436c209,I12bb457a,If1e98afe into main

* changes:
  Add tests for cancellation of each type
  Add tests for killswitch enabled
  Update tests to override DeviceConfig values
  Make deviceconfig values updatable