Merge pull request #5859 from stenzek/android-ubershader-setting Android: Fix ubershader hybrid setting