Merge "Fix graphical artifact in the fisheye effect"
am: 0b885b8096

Change-Id: I07a41a6a7e7cb7f145b3624bf58e4addeeb24547