Merge "Revert "Revert onSurfaceRedrawNeeded behavior""