Merge "Merge "Fix occasional bad placement of Conversation header" into rvc-dev am: c744ad246e am: fa9391fead" into rvc-d1-dev-plus-aosp