Merge "Fix small issue where overflow expanded view wouldn't show" into main