Merge "Not relying on activity manager when choosing a touch consumer." into ub-launcher3-master