More aggressive search stop.
Merge branch 'master' of https://github.com/frostwire/frostwire-android