Merge "Fix two problems related to data connectivity in the multi-SIM header" into qt-dev