Merge "Updating shared lib for display id change." into ub-launcher3-master