Merge "Centering battery view in shade header" into main