am 897223a1: am d669d488: am 34d723d8: Merge change I32371166 into eclair

Merge commit '897223a1040ce29edc9c2fd500071ab7f559e5fe'

* commit '897223a1040ce29edc9c2fd500071ab7f559e5fe':
  Fix issue #2239203: Setting large background causes OOME and soft-reboot spiral