Merge "Show snoozed conversations in conversation header" into rvc-dev