Merge "Avoid using raw pointers in QueuedInputListener" into tm-dev