Merge "[Magnifier - 8] SurfaceView support and invalidate revival"