Merge "Keep QS brightness slider icon in sync." into jb-mr1-dev