Merge "Strings for pSIM on/off toggle removal" into qt-dev