Merge "Fix NPE on app launch log" into ub-launcher3-master