am 34bd5969: Merge "Respect user settings for spell checking language if explicitly set" into ics-mr1

* commit '34bd596935ccd4574dbf6c6e7bfa24323e3e8e1f':
  Respect user settings for spell checking language if explicitly set