Login triggered if requested after provider switch

Request code for switching provider was not being considered in onActivityResult.
Merge branch 'bug/login-button-from-Provider-Details-does-not-always-trigger-login-dialog-#4647' into develop

Signed-off-by: Sean Leonard <meanderingcode@aetherislands.net>