Merge "Do not reuse phonestatelistener"