Merge changes from topic "am-16951e85df6d42e5b2530da903446616"

* changes:
  [automerger skipped] Merge "Implement a global maximum on number of shortcuts an app can publish" into sc-v2-dev am: e51fb72b -s ours am: 63d803e6 -s ours am: 62945c47 -s ours am: 9507b446 -s ours am: db3c399f -s ours
  [automerger skipped] Implement a global maximum on number of shortcuts an app can publish am: 7622d6da -s ours am: 800028ab -s ours am: 983196d8 -s ours am: 654a4b35 -s ours am: 3598883b -s ours