Merge "Ensure race between rollback and roll forward is properly handled" into qt-dev