Merge "Fail to enable rollback if enable rollback times out" into qt-dev