am 31ab51a3: am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."

* commit '31ab51a369ab57c82d0271115ba31b3b20ce6e6b':
  Prevent empty overflow popup when there are no overflow items.