Merge changes I5639f639,Ied40e56a into main

* changes:
  [Old [Battery] [Flexi]] Use textColorPrimary for ShadeHeader
  [[Old] Battery] Set the battery colors in ShadeHeaderController