Merge changes I8dfeea00,I1576fc54 into main

* changes:
  Reduce use of any/nulls from proxy connection and proxy client.
  Fix device change detection.