Merge "Keep quick settings brightness icon/dialog level in sync." into jb-mr1-dev