Merge "Add extra data when starting emergency dialer intent"