Merge "Fix visual glitch when no contacts/groups"