Merge "Revert onSurfaceRedrawNeeded behavior"