Merge "Support frame-synchronized clipping on SurfaceView"