Merge changes from topic "device_state_manager"

* changes:
  Rename cancelRequest API to cancelStateRequest and remove the request parameter
  Updates OverrideRequestController to allow for one override request at max