Merge "Fix graphical artifact in the fisheye effect"