Merge "FenceTimeline: Fix a potential race condition" into qt-dev