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

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