Merge "Add a feature flag to guard the large screen feature in Settings app." into sc-v2-dev