Merge "Don't updateSurfacePosition with invalid window frames"