Merge "Fix for NonSimulatorConnection listener causing dialer crashing after ending a call."