Merge "Automatically disconnect emergency call" into 24D1-dev