Merge "Support multiple devices in winscope proxy" into tm-dev