Merge "Sorting and merge Emergency number better" into qt-dev
am: 73c5892fc9

Change-Id: I8fae1806ffdd6657d811af21bdc77ff356e48efa