Merge "Continue searching for device state after exception" into tm-qpr-dev