Merge "Preventing null pointer crash when opening a folder" into ub-launcher3-burnaby