Merge "SurfaceView: Fix some log spam."