Merge "[ExpressiveBattery] Update BatteryHeaderTextPreference" into main