Merge "Wrap around text so that it isn't cut off" into rvc-dev