am 03cc73bc: 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 '03cc73bcc72f99b6b6caeca393be85a80e203c04':