Merge "[Bugfix] avoid deadlock caused by AppBatteryTracker.dump" into main