Merge "Use QS context when creating the bluetooth battery indicator" into oc-mr1-dev