Merge "Single credential sign in with provider screen changes" into main