Merge "Zero tolerance towards referred destroyed activities" into ub-launcher3-master