Merge pull request #10503 from JosJuice/android-directoryinitialization-thread Android: Actually use a thread for DirectoryInitialization
