Merge "Allow the old launcher content URI to be overrided" into ub-now-mister-ugly