[1.7.x] Include swapped apps in autodetector state