in "Swap apps" listing, the app above F-Droid is always highlighted

There is logic that is supposed to ensure that F-Droid is always shared. It looks like it is now off by one, since the app above it is highlighted on my device. My guess is that this is because the first item in the list is now not an app, but the instructions.

Perhaps a cleaner way to implement that would be to make the "Tap to select..." a TextView where the visibility is changed based on the scroll position. Then the list will be purely apps. Donno if that is realistic, that's just off the top of my head.