HealthKit Data Share Screen at Login & After Canceled Registration Followed by new registration

[webmd-lsetch]

We've identified two areas where the HealthKit pre-share screen appears but when the user taps next for the iOS modal to appear they taken to the following screen in the flow.

Login Scenario
When a user forgets their passcode or needs to login they are shown the HealthKit share screen again. When the user clicks next, it skips to the Enter Passcode Screen. If a user cannot update their HealthKit sharing settings, can we remove this step from the Login workflow?

Canceling Registration After Sharing HealthKit Data & Starting Over with a New user
If a user cancels their registration after sharing HealthKit data and then starts over in the process from the beginning - they see the HealthKit Share screen, but skip the iOS modal and go to the registration screen.

For users who are paying attention, this creates an odd user experience.