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

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