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

* commit '647046637efc2b7414b15062cc650cb690c01f46':