Merge "Stop using trigger_reset_main." into qt-dev