Merge "display the phone number from the correct subId" into qt-qpr1-dev