Merge "Fix NPE on FeatureFlag.addChangeListener" into ub-launcher3-master