Merge "Fix modulation and gamma correction issues" into jb-mr1-dev