Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev