Merge "Modify Settings to use new SIM call manager API" into qt-dev