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

* commit '76ac344cb61a74267c04249c9e9feec41a82c504':
  Allow the old launcher content URI to be overrided