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

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