Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev