Merge pull request #6439 from JosJuice/android-ubershader-config Bring the Android GUI setting for ubershaders up to date
