Merge "Add trace marker for service start/stop"