Merge "Add Foldable feature flag"