Merge "Prevent empty overflow popup when there are no overflow items."