Merge "Fix backward compatibility when there's no secureElementName"