Merge "Remove feature flag for settings app info v2"