Merge "Fix occasional bad placement of Conversation header" into rvc-dev