Merge "Listen for cases where touch controllers change, and update them" into ub-launcher3-master