Merge "Fix regression in emergency dialing auto-disconnect code." into pi-dev