Merge "Fix issue with delegate consumers being overwritten" into ub-launcher3-master