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

Change-Id: I8fa7371d2238f3465e9ea52dfebaa50e91ced0e1