Merge "Clicking convo header launches notif settings" into rvc-qpr-dev