am 235a50e0: Merge "Fix ConcurrentModificationException in InstallShortcutReceiver" into jb-ub-now-indigo-rose

* commit '235a50e0d1a303e586c36bc5e70d560b8b924d58':
  Fix ConcurrentModificationException in InstallShortcutReceiver