Merge "Fix overlap of text and star in controls" into rvc-dev