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

Change-Id: Iaaf6e1b4af1606f210710bc7c0a5b21df91dc978