Merge "Add battery indicator to bluetooth icon"