am f5ed4f11: (-s ours) DO NOT MERGE - Fix 2941495: Launcher short-cut icons don\'t work for apps on SD card after reboot

Merge commit 'f5ed4f1141ae41e25e249f6e085c7080f11dc968'

* commit 'f5ed4f1141ae41e25e249f6e085c7080f11dc968':
  DO NOT MERGE - Fix 2941495: Launcher short-cut icons don't work for apps on SD card after reboot