Merge "Don't scale screen brightness by electron beam level." into jb-mr1-dev