Merge "Instrument Service lifecycle events" into main