Merge "[sf] Update hdrlisteners to use new frontend"