Merge "Add a category key for the adaptive battery settings page"