Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev