Merge "Add feature flag for seamless transfer"