Merge "Change first time warning update order" into qt-dev