Merge "Removing code for the unused 'upgrade path'" into ub-launcher3-master