Merge "Reduce auto-brightness jitter." into jb-mr1-dev