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

* commit 'd2cefc1838122f16894a077dc627e281c87a56ae':
  Make surfaceRedrawNeeded forgiving

Change-Id: If79cd79bd2b512cd0d63ad2e122414c30a37eb95