Merge "Unifying the two different state listeners" into ub-launcher3-master