Merge "Caching clean up, remove dependency on old shared lib loading/caching logic" into ub-launcher3-master