Merge "Fix battery background color in QS"