Merge "Fix NPE in ForwardingListener" into nyc-support-24.1-dev