Merge "Add support for auto-brightness adjust, but leave it disabled." into jb-mr1-dev