Merge "Add listener for conversation changes" into sc-dev