Merge "Revert "Wrapping folderLisners with weak reference, and storing it as an array"" into ub-launcher3-calgary