Merge "Don't show "unified challenge" for profile with non-shareable credential" into main