Move timeline config together

Change-Id: Ice74e77b9d9b7a25cd748d3c04701a6834f691e2
Merge "Move timeline config together"