Merge "Improve auto-brightness hysteresis." into jb-mr1-dev