Merge "Cleanup strings for iconoverride" into ub-launcher3-master