Merge "Add bt battery level to QS icons" into oc-mr1-dev