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

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