Merge "Delay processing of BatteryStats events until onSystemReady" into main