Merge "Ignore scheduled onDeviceGone call on simulated device if it is already no longer present." into tm-dev