Timeline redone using SolidColor #4618

Change-Id: I8be7ff8bed907a11ea0e2210c612bb1c3c10378a