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