Merge changes I1ddcd4e6,I93e306db

* changes:
  Parses share targets from shortcuts.xml
  Use client context to pass ShortcutManager tests