Merge "More Brightness Adjustments" into jb-dev