Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev
am: 28e284b

* commit '28e284bd0678a7044b1d23879ef32018b1ca7384':
  Make surfaceRedrawNeeded forgiving

Change-Id: I29d93998f89ad7317961b0cc32e0cee1a947b9d3