Merge "Resolver - Center text with no sublabel" into rvc-dev