Merge changes Ie5bfc2f6,I38e7dc8c,I9308a15a into rvc-dev

* changes:
  Reinflate notif when [un]marked as conversation
  Update conversation UI when importance changed
  Add unread count badge to conversation layout