Merge "Use isCeStorageUnlocked() in ConfirmDeviceCredentialActivity" into main