Merge "Merge "Actually use listener hints?" into pi-dev am: 571afb3b78 am: d3b217940b"