Merge "Merge "Add battery indicator to bluetooth icon" into oc-mr1-dev am: c3321c81 am: 46454f6f -s ours"