Merge "Add cancel_when_requester_not_on_top to device_state print-states output" into udc-dev