Merge "Updating the system shared lib" into ub-launcher3-master