Merge "Show 2nd row if we have 1 row in active profile and empty state in other" into rvc-dev