Merge "Make sure that we update SurfaceView's window with display lists. Bug #3395487" into honeycomb