Merge "Fixed a bug where the ConfirmDeviceCredentials activity was shown twice." into mnc-dr-dev