Merge "Track whether we've logged the "intercepted" state of a record." into tm-qpr-dev