Merge pull request #9357 from JosJuice/android-one-settings-entrypoint Android: Only have one settings entrypoint per activity/dialog
