am 5fc26f60: am ee507eb5: am 89889733: Merge change I4e83a76a into eclair

Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8'

* commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8':
  Fix bug 2201417. Whenever the System setting that indicates