Merge "Adding in missing changes to ub-launcher3-master." into ub-launcher3-master