Bugfix/zi 13898 device id null in some cases#1

avwave wants to merge 2 commits intostagingavwave/z_webcomponent:stagingfrom

bugfix/ZI-13898-device_id-null-in-some-casesavwave/z_webcomponent:bugfix/ZI-13898-device_id-null-in-some-casesCopy head branch name to clipboard