Merge "Add back code missing from upstream merge" into ub-launcher3-master