Merge "Fix battery level quick settings tile bug." into jb-mr2-dev