Merge change I32371166 into eclair

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