Merge "Updating launcher assets.  (Bug 6499087)" into jb-dev