Merge "SF: Clean up ftl::SmallMap lookup fallbacks" into udc-dev