Merge "Fix NPE in service dump" into ub-launcher3-qt-r1-dev