Merge "Create a feature flag for large screen design"