am 20e45a8e: Merge "Do not allow duplicate shortcuts when ALL_APPS is disabled." into jb-ub-now-kermit

* commit '20e45a8ef819bbb9d628176803268bb3c8aba09a':
  Do not allow duplicate shortcuts when ALL_APPS is disabled.