Merge "Move emergency call to main thread" into sc-dev