Merge changes Ibfb3cf6f,I9a4bd220 into rvc-dev

* changes:
  Load Uri based shortcut drawable in LauncherApps
  Adds icon URI field to shortcutInfo