am 3bac3ad2: (-s ours) am 9737dc4d: am 5c49a908: (-s ours) Merge change Ic73ec39b into eclair

Merge commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e'

* commit '3bac3ad2dfb11c99ebfc5cd0374b29259686117e':
  DO NOT MERGE. Implement WAR which should prevent the white square bug from appearing on user devices.  If we see a 0 texture id during bind for rendering, attempt to re-upload.  If this fails log debug info and restart the app.