Merge "Fix sim pin on DSDS" into qt-r1-dev