Fix timeline white background fix
merge fix