Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into main