Merge "improve mism support for phonestatelistner"