Merge "Update one-line layout for conversation notifs" into rvc-dev