Merge "SF: Fix hdr info listeners"