merged 26787 from after the failed menu merge. "fix autofinder on device remove (nw)"