Merge pull request #4643 from SeannyM/settings-saving Android: Change Exit Without Saving to Save and Exit