Track contact id and message id directly in link clicks.
Merge branch 'production' into test