Merge "Avoid race condition when broadcasting device list changed." into pi-dev