Merge pull request #9064 from JosJuice/android-filepicker-normal Android: Make FilePicker act like a normal setting
