Merge "Clear locally tracked BT device for non-BT devices." into main