Merge "Add a feature flag for home application improvements" into main