Merge pull request #9011 from JosJuice/android-settings-viewmodel Android: Persist Settings using ViewModel
