Merge "Add more checks to AppIcon.launch()" into ub-launcher3-master