Merge "Tap convo avatar to expand/collapse" into rvc-dev