Merge "Connect feature flag into bounding box related APIs" into main