Merge "Trace events while not recording history." into udc-dev