Merge changes from topic 'am-58d0617b-47f2-44b7-ac1f-c278ee055d1e' into ub-launcher3-master

* changes:
  Merge commit 'e3c59256794448c67e01333a9f5036559b1bd502' into am-58d0617b-47f2-44b7-ac1f-c278ee055d1e
  Use source bounds/activity options for App Info System Shortcut