Merge "Remove IMaintenanceActivityListener (which was unused)"