Merge " fix Memory Leak caused by PhoneStateListener" into nyc-dev