Merge changes I7275175e,I4422c7e7 into sc-dev

* changes:
  Small tweaks to improve messaging/conversation appearance.
  Correct the centering of the conversation avatars when badged