Merge pull request #6034 from JonnyH/WIP/fix-android-null-SettingsSection-crash Fix some Android UI crashes opening 'settings' menus
