Merge "Updating manifest entry as per API changes" into ub-launcher3-master