Merge "Optimize incidentd memory usage" into pi-dev