Merge "Kill ConfirmDeviceCredentialBaseActivity when it is no longer visible" into nyc-dev