Merge "Actually use listener hints?" into pi-dev