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

Change-Id: I31fbee1ed943fa75984b4b3a124be793819a60fd