Merge branch 'fix-inspector-system-info' into 'mainline'

application-client: Check for null when getting os info

See merge request !651

(cherry picked from commit 58175487)

c524e177 application-client: Check for null when getting os info