Merge "Fix the overflow button getting stuck in the dot position" into main