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

* commit '609bfc396665a8a315df3269b7a439763f298f6a':

Change-Id: I8ca183a997f744453869ebd42625e5c15c00eb3c