Fix device disconnected whilst monitoring#830

jboddey merged 2 commits intodevgoogle/testrun:devfrom

bug/device_conn_monitoringgoogle/testrun:bug/device_conn_monitoringCopy head branch name to clipboard