Merge "Fix Overview crash with 3 button navigation when animation is disabled" into main