Merge "Revert "Temporarily make TouchInteractionService direct boot unaware"" into ub-launcher3-master