Merge "Remove the click action for battery header"