Merge "Fixing TouchInteractionService referring destroyed activity" into ub-launcher3-master