Merge "Fix NPE when DEBUG = false" into ub-launcher3-master