Merge changes I76df6529,I99594ae9 into rvc-dev

* changes:
  Fixed the heads up layout of conversations
  Fixed an issue where the conversation title was showing doubled