Merge "Revert "improve mism support for phonestatelistner""