am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic

* commit '1fa05179eb4ccbe264c67b6acb3abf2793b03197':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)