Merge "Update bug id for feature flag." into main