Merge "Prevent swipe-to-dismiss conversation header" into rvc-dev