Merge "Fix initial brightness state after startup." into jb-dev