Merge "Fix the overflow button disappearing suddenly during animations" into main