Merge "Remove simulated device from "present" list when disassociated." into tm-dev