resolve merge conflicts of 2953833bcb to ub-launcher3-calgary
am: ecd365293f

* commit 'ecd365293fedf8b78cf1e8df0b9d93968c9910ba':
  Adding a utility method to iterate over folder contents