am 681a4ace: Merge "Updating folder icons when the shortcut is updated. (Bug 10803060)" into jb-ub-now-jetsonic

* commit '681a4aced8e3b5029aafdc3f45d3f47b96d26f9c':
  Updating folder icons when the shortcut is updated. (Bug 10803060)