Merge "Updating feature flags subclassing" into ub-launcher3-master