Merge "Fix Chip menu expanding outside the screen" into main