am 2916480f: Reconcile with jb-release nakasi-factoryrom-release

* commit '2916480f06f23b2b29deeb0c3c78dbb161a4ee49':
  Updating launcher assets.  (Bug 6499087)
  Change custom workspace cling
  Fixing regression where you can't add shortcuts
  Removing logging related to and fixing (issue 6238330)