Merge "Vignette filter:  precompute more values, simplify math, cleanup code" into jb-mr1-dev