Merge "Prevent estimates from updating while callbacks are happening" into qt-dev