Merge commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60' * commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60': Set intent_component of in-app shortcuts to app itself
Merge commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60' * commit 'f0e66e55a3e1d87d7cf68f699a0c4168faf4cf60': Set intent_component of in-app shortcuts to app itself