Merge "incidentd: cleaning up settings.proto" into pi-dev