Merge change Ibac5ab03 into eclair-mr2

* changes:
  Add a guard on InspectorTimelineAgent, and remove unnecessary guards...