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

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