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

Change-Id: I4690e7cd10cd272574b0820e2e12707c7b2dee72