Merge "Update the logic of isFeatureEnabled and isFeatureNotChickenedOut" into main