Merge change 25918 into eclair

* changes:
  Set intent_component of in-app shortcuts to app itself