Merge pull request #9592 from JosJuice/android-launch-rescan Android: Fix rescanning on first app launch after cache clear
