Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class"