Merge "Register conversation listeners" into sc-dev