Merge "Fix first battery message on boot" into main