Merge "Document that SurfaceView is synchronous in N" into nyc-dev