Merge "Merge "Fix graphical artifact in the fisheye effect" am: 0b885b8096 am: f22a6f7c60 am: 1ab5ad358c am: 8b754dd8c9" into oc-mr1-dev-plus-aosp