Merge "Fix NPE" into ub-launcher3-master