Merge "Disable automatic screen dimming." into jb-dev