Merge "Simplifying FeatureFlags by moving common flags to a base class. Only the modified flags need to be redefined." into ub-launcher3-dorval-polish2