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

Merge commit 'd669d48888fdefab4907f4de5b296fc366b59eaf' into eclair-mr2-plus-aosp

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