Merge "Cancels device state if process dies" into main