Merge changes Ia152bc41,Iae8026e7 into rvc-dev

* changes:
  Added back the recently alerted indicator to conversations
  Reintroduced app ops for conversation notifications