Merge "Revert "Add Foldable feature flag""