Merge "Adjust auto-brightness time constants." into jb-mr1-dev