Merge "Fix manual brightness adjustment." into jb-dev