Repair deviceNumber confusion by adding the deviceIdentifier property which must always remain unique within an app execution.