Merge "Adding missing SurfaceView methods"