Merge "Add intent handler for HF battery indicator (2/2)"