Merge "Optimize for single provider / cred type case on the primary screen" into main