Merge "Fix text / convo icon overlap in RTL" into rvc-dev