Merge "Refactor IncidentCompanionService to move the pending report logic into its own class."