Merge "Redraw whole timeline on bookmark remove." into main