Merge "DeviceFlag change is not detected when phenotype updates." into ub-launcher3-master