Merge "Add ADAPTIVE_BATTERY_MANAGEMENT_ENABLED" into pi-dev