rememberAuthChoice: resolve conflicts with 2.0 branch (#2737)

5 jobs for rememberAuthChoice in 24 minutes and 25 seconds (queued for 26 seconds)