am 606726ba: Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby

* commit '606726ba289583a67188d9448b220c2e3fae87d7':
  Preventing null pointer crash when opening a folder