Merge pull request #6282 from mahdihijazi/replace_file_browser [Android] Replace current file browser
