Merge "Add back render-ahead support" into qt-dev