Fixup Connect, Onboarding, and Home screens

In #40028 (closed) we landed an initial set of patches. Now let's fix some remaining issues.