Merge "Fix Calls/SMS default SIM selector" into qt-dev