Merge "Re-add resetTranslation() call that went missing" into qt-dev