Merge "Handle device presence registry when device is already active." into tm-dev